tests: Fix two bugs in tests revealed by new remote changes

diff --git a/tests/test-admin-deploy-2.sh b/tests/test-admin-deploy-2.sh
index 0667ed5d4ae907fca7440bdac151f50e295d4fa6..0d7ccf039949a6c68e079a0cce82886c60003708 100755 (executable)
--- a/tests/test-admin-deploy-2.sh
+++ b/tests/test-admin-deploy-2.sh
@@ -46,7 +46,6 @@ ostree admin --sysroot=sysroot upgrade --os=testos
 bootcsum2=${bootcsum}
 os_repository_new_commit "1"
 bootcsum3=${bootcsum}
-ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime
 ostree admin --sysroot=sysroot upgrade --os=testos
 
 rev=${newrev}

diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js
index da9c732302cfb98a71394fec79a865a34b6750bd..fc8e91fd66ff0568f0d5290ffda293ebaabd990b 100644 (file)
--- a/tests/test-sysroot.js
+++ b/tests/test-sysroot.js
@@ -64,12 +64,9 @@ assertEquals(deployments.length, 0);
 //// Add the remote, and do a pull
 
 let [,sysrootRepo] = sysroot.get_repo(null);
-let sysrootRepoConfig = sysrootRepo.get_config();
-let testosRefSection = 'remote "testos"';
-sysrootRepoConfig.set_string(testosRefSection, 'url', 'file://' + upstreamRepo.get_path().get_path());
-sysrootRepoConfig.set_boolean(testosRefSection, 'gpg-verify', false);
-sysrootRepoConfig.set_string_list(testosRefSection, 'branches', [runtimeRef]);
-
+sysrootRepo.remote_add('testos', 'file://' + upstreamRepo.get_path().get_path(),
+                      GLib.Variant.new('a{sv}', {'gpg-verify': GLib.Variant.new('b', false),
+                                                 'branches': GLib.Variant.new('as', [runtimeRef])}), null);
 sysrootRepo.pull('testos', null, 0, null, null);
 
 //// TEST: We can deploy one tree